bitkeeper revision 1.1159.1.500 (41c9ced6bi_22nPlm0WqxtYuPUpiTw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 19:45:26 +0000 (19:45 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 19:45:26 +0000 (19:45 +0000)
commitd6296b85e457629b4863db93e68a9e64e624ca03
treea8b9ed426fa0eb7e70fc5804f10883625154aa31
parentd3914f9b9661d03c4ec246880b868a8a1b2e53e6
parent84bb38f7b0840e66e08572ed9c3cd9caf5bd4a45
bitkeeper revision 1.1159.1.500 (41c9ced6bi_22nPlm0WqxtYuPUpiTw)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk